- put everything in "GiNaC" namespace

[ginac.git] / ginac / indexed.cpp

diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index ffcf5141734b25af6d402908562a16c1fbfa91df..48a8c94801c4c7c9bc8a345b0218d57f2e1ed109 100644 (file)
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -1,7 +1,8 @@
 /** @file indexed.cpp
  *
 /** @file indexed.cpp
  *

- *  Implementation of GiNaC's index carrying objects.
- *
+ *  Implementation of GiNaC's index carrying objects. */
+
+/*

  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify


@@ -21,7 +22,12 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "ginac.h"
+#include "indexed.h"
+#include "ex.h"
+#include "idx.h"
+#include "debugmsg.h"
+
+namespace GiNaC {

 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers


@@ -32,7 +38,7 @@
 indexed::indexed()
 {
     debugmsg("indexed default constructor",LOGLEVEL_CONSTRUCT);
 indexed::indexed()
 {
     debugmsg("indexed default constructor",LOGLEVEL_CONSTRUCT);

-    tinfo_key=TINFO_INDEXED;
+    tinfo_key=TINFO_indexed;

 }
 
 indexed::~indexed()
 }
 
 indexed::~indexed()


@@ -80,14 +86,14 @@ void indexed::destroy(bool call_parent)
 indexed::indexed(ex const & i1) : exprseq(i1)
 {
     debugmsg("indexed constructor from ex",LOGLEVEL_CONSTRUCT);
 indexed::indexed(ex const & i1) : exprseq(i1)
 {
     debugmsg("indexed constructor from ex",LOGLEVEL_CONSTRUCT);

-    tinfo_key=TINFO_INDEXED;
+    tinfo_key=TINFO_indexed;

     ASSERT(all_of_type_idx());
 }
 
 indexed::indexed(ex const & i1, ex const & i2) : exprseq(i1,i2)
 {
     debugmsg("indexed constructor from ex,ex",LOGLEVEL_CONSTRUCT);
     ASSERT(all_of_type_idx());
 }
 
 indexed::indexed(ex const & i1, ex const & i2) : exprseq(i1,i2)
 {
     debugmsg("indexed constructor from ex,ex",LOGLEVEL_CONSTRUCT);

-    tinfo_key=TINFO_INDEXED;
+    tinfo_key=TINFO_indexed;

     ASSERT(all_of_type_idx());
 }
 
     ASSERT(all_of_type_idx());
 }
 


@@ -95,21 +101,21 @@ indexed::indexed(ex const & i1, ex const & i2, ex const & i3)
     : exprseq(i1,i2,i3)
 {
     debugmsg("indexed constructor from ex,ex,ex",LOGLEVEL_CONSTRUCT);
     : exprseq(i1,i2,i3)
 {
     debugmsg("indexed constructor from ex,ex,ex",LOGLEVEL_CONSTRUCT);

-    tinfo_key=TINFO_INDEXED;
+    tinfo_key=TINFO_indexed;

     ASSERT(all_of_type_idx());
 }
 
 indexed::indexed(exvector const & iv) : exprseq(iv)
 {
     debugmsg("indexed constructor from exvector",LOGLEVEL_CONSTRUCT);
     ASSERT(all_of_type_idx());
 }
 
 indexed::indexed(exvector const & iv) : exprseq(iv)
 {
     debugmsg("indexed constructor from exvector",LOGLEVEL_CONSTRUCT);

-    tinfo_key=TINFO_INDEXED;
+    tinfo_key=TINFO_indexed;

     ASSERT(all_of_type_idx());
 }
 
 indexed::indexed(exvector * ivp) : exprseq(ivp)
 {
     debugmsg("indexed constructor from exvector *",LOGLEVEL_CONSTRUCT);
     ASSERT(all_of_type_idx());
 }
 
 indexed::indexed(exvector * ivp) : exprseq(ivp)
 {
     debugmsg("indexed constructor from exvector *",LOGLEVEL_CONSTRUCT);

-    tinfo_key=TINFO_INDEXED;
+    tinfo_key=TINFO_indexed;

     ASSERT(all_of_type_idx());
 }
 
     ASSERT(all_of_type_idx());
 }
 


@@ -286,3 +292,4 @@ bool indexed::all_of_type_idx(void) const
 const indexed some_indexed;
 type_info const & typeid_indexed=typeid(some_indexed);
 
 const indexed some_indexed;
 type_info const & typeid_indexed=typeid(some_indexed);
 

+} // namespace GiNaC