upd some files to changes

include/aidge/operator/BitShift.hpp

@@ -171,13 +171,7 @@ public:
  * @param[in] name (Optional) Name of the node.
  * @return A shared pointer to the created node.
  */
-<<<<<<< HEAD
-inline std::shared_ptr<Node> BitShift(const BitShift_Op::BitShiftDirection direction,bool rounding = false, const std::string& name = "") {
-    return std::make_shared<Node>(std::make_shared<BitShift_Op>(direction,rounding), name);
-}
-=======
-std::shared_ptr<Node> BitShift(const BitShift_Op::BitShiftDirection direction, const std::string& name = "");
->>>>>>> 8b2420d7 (Move code from header to source file)
+std::shared_ptr<Node> BitShift(const BitShift_Op::BitShiftDirection direction, bool rounding = false, const std::string& name = "");
 
 } // namespace Aidge
 

python_binding/operator/pybind_Stack.cpp

@@ -35,7 +35,7 @@ void init_Stack(py::module &m) {
 			}
 			return result;
 		})
-        .def_readonly_static("Type", &StackOp::s_type);
+        .def_readonly_static("Type", &StackOp::Type);
 
     m.def("Stack",
           &Stack,

src/operator/BitShift.cpp

@@ -25,7 +25,7 @@ namespace Aidge {
 
 const std::string BitShift_Op::Type = "BitShift";
 
-BitShift_Op::BitShift_Op(BitShiftDirection direction)
+BitShift_Op::BitShift_Op(BitShiftDirection direction, bool rounding)
     : OperatorTensor(Type, {InputCategory::Data, InputCategory::Data}, 1),
       mAttributes(std::make_shared<Attributes_>(
         attr<BitShiftAttr::BitShiftdirection>(direction),
@@ -85,8 +85,8 @@ std::set<std::string> BitShift_Op::getAvailableBackends() const {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-std::shared_ptr<Node> BitShift(const BitShift_Op::BitShiftDirection direction, const std::string& name) {
-    return std::make_shared<Node>(std::make_shared<BitShift_Op>(direction), name);
+std::shared_ptr<Node> BitShift(const BitShift_Op::BitShiftDirection direction, bool rounding, const std::string& name) {
+    return std::make_shared<Node>(std::make_shared<BitShift_Op>(direction, rounding), name);
 }
 
 } // namespace Aidge