X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=d7ec5e11bc3525102d073b7d171fb5be6f478d2c;hb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;hp=3b75f88482e6ec3bc5613471f3dfde9d40a826e1;hpb=04394ded8776d2163c1e815ccc8170b81d76b028;p=pulseview.git

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 3b75f88..d7ec5e1 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -69,13 +68,13 @@ Decoder::channels() const
 	return channels_;
 }
 
-void Decoder::set_channels(std::map<const srd_channel*,
-	std::shared_ptr<data::SignalBase> > channels)
+void Decoder::set_channels(map<const srd_channel*,
+	shared_ptr<data::SignalBase> > channels)
 {
 	channels_ = channels;
 }
 
-const std::map<std::string, GVariant*>& Decoder::options() const
+const map<string, GVariant*>& Decoder::options() const
 {
 	return options_;
 }
@@ -146,6 +145,6 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 	return decoder_inst;
 }
 
-} // decode
-} // data
-} // pv
+}  // namespace decode
+}  // namespace data
+}  // namespace pv