Changeset c10f46 in git for factory/variable.cc

Timestamp:

Aug 3, 2012, 1:06:22 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

b0732eb4254fbe76540d72c337f3d7f985adf948

Parents:

b8610796eaca5ba7db8dc75f8bc88d698e077b365abb0e7fdca82a2bad9778e410148c74d7b49a0b

Message:

Merge pull request #162 from steenpass/libs

changes in LIBs from master

File:

• factory/variable.cc (modified) (1 diff)

factory/variable.cc

@@ -215 +215 @@
 }
 
-/*void setMipo ( const Variable & alpha, const CanonicalForm & mipo)
+void setMipo ( const Variable & alpha, const CanonicalForm & mipo)
 {
     ASSERT( alpha.level() < 0 && alpha.level() != LEVELBASE, "illegal extension" );
     algextensions[-alpha.level()]= ext_entry((InternalPoly*)(conv2mipo( mipo, alpha ).getval()), true );
-}*/
+}
 
 bool hasMipo( const Variable & alpha )
 {
-    ASSERT( alpha.level() < 0 && alpha.level() != LEVELBASE, "illegal extension" );
-    return ((algextensions!=NULL) && getReduce(alpha) );
+    ASSERT( alpha.level() < 0, "illegal extension" );
+    return (alpha.level() != LEVELBASE && (algextensions!=NULL) && getReduce(alpha) );
 }